Base: fix some compiler warnings

Change-Id: Ifb609ca1091edd92cfb414dfc8c3c501d3e38a9d