Build Fix and Some other small fixes

Change-Id: Ifda2ae4a5ff91ceb1c88abad304e20e94fbb8e00