Fix-ups so it compiles