More various clean-up and fixes

Fixes build errors and cleans up BaseStatusBar

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>