units: fixes