fix some shadow problems