Yay, fix code to compile with language changes