And fix a few compilation warnings.
Signed-off-by: NFelipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: NHiroshi DOYU <Hiroshi.DOYU@nokia.com>