Fix up broken compiles