Fixed various bugs with collision events