Hardsuit fixes.

Fixes:
#7182
#7181
#7180
#7178
#7128
Good point, will commit some more to this before it's merged.