Fixes to galaxy-integration