Fix some GR stuff