[#2121] Fixing a now defunct include
[#2121] Tweaking a few things related to new render changes