More Facade Rendering tweaks

No, this does not fix #1287, sorry.