Typing units correctly