Some spatialmanager logic re-instated