Some divergence warning fixes Merge branch 'divergence-fixes' of SpaceUsurperUnity into divergence-fixes Merge branch 'divergence-fixes'