Bunch of fixes for Units