Fix magic numbers