Unit fixers work. Fixes #20. Fixes #19. Fixes #18.