[DCOSS] tiny fixes to spare the room