Fixes some collision issues