unit: fixes