Fixed compile errors from last checkin