Fixing compile errors from the latest merge?