Better render handling of basic blocks