Remove some other magic numbers