Somewhat partial fix for zfighting

- THANKS @ft975!!!