PArtial fixups
Fix build failures
Merge remote-tracking branch 'origin/master' into 021214renderer
Isolating z-fighting issues to fix