Various minor fixes for units

--no-rebase