Fixes for Spaces

Merged Dixit, Jait (jaitd) requested to merge space_fixes into master

Merge request reports