Fixes in DataSpace loading