Fixed some bugs with collision box