Some more collision fixes (small details - still some more to do)