Fixes up some missing units after rebase
(Fixes more things I missed in rebase)
Use `SCALE` factor to compute Game->Pixel