Space Manager fixes.