Fix compile errors caused by ahem 'minor' changes before :(