Forgot to add local compilation fixes