units: various minor fixes.