Forgot to push my compiler fixes