Fix some collision logic