Fixed some magic numbers