Minor changes to compile