Restore ability to do unit math