Fix Magic number issues.