Fix compiler quirks