Fixing compile errors resulted from previous checkins