Some changes to the rendering system