Quick collision fixes