Fixed a couple of problems with the render unavailable function