Fix compiler warnings

Change-Id: I51b86be846618df45595cb176c34ee8a8558082d
Reviewed-by: hjk <hjk121@nokiamail.com>