Removed more warnings not letting it compile

Change-Id: I1b2fcf30685ea8f24d2f77f588fccd0cb0883e6c