fixes for nxstyle errors reported by nxstyle tool Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>