Fix some issues with units