Rendering changes and other minor changes.