do some collision fixes