Add a couple more checks to the 3d collision detection, without