monolithic rendering fixes