Compilation fixes to previous commit