Fixes for running this as a normal renderer