Minor cleanup and render fix