Fixes to collision checks