Fixed some magic number bugs