Small fixes wrapping up GR4