RAM-118 Fix some compile issues
RAM-118 Fix some compile issues

dave-cheong/RAM,atogov/RAM,sundriver/RAM,atogov/RAM,sundriver/RAM,dave-cheong/RAM,atogov/RAM,dave-cheong/RAM,atogov/RAM,sundriver/RAM,sundriver/RAM,dave-cheong/RAM