Fixing compile breaks