Fix minor compile errors after merge