Some minor tweaks, hopefully they won't conflict
dealing with conflicts