Removed even more warnings

Change-Id: Ic5d25b55fef38d94aa1fd2f71822d1f18f2c99f6