Fix Magic Numbers