[#364] misc collision fixes