Attempt to fix some collision bugs