Fix a physics issue + improved collision handling