Clean up some normal handling and a shader error in D3D

Fixes #6783.

-[Unknown]