Fixed some more unit and orientation issues