rocket collision fixes