Compilation annoyances

These were bugging me