Fixed all the slot number issues