Fix compile errors after merging