some fixes for uv overlap issues