Fix minor descrepancies in collision detection