Fixed all warnings

Change-Id: I878d45f723e740647c9218531f5d30bbd2452a4c