Fixed indent

Change-Id: I7007687025b7475aa6b534e9d6877e9799a63dd7
Silenced cast warnings

Change-Id: I6200c639df27b3a8570049387701ed2d99b08bc6