Small fixes to units