Minor changes to compile with incoming/HEAD once more