Tweaks: Some space fixes