More enemy collision fixes