Minor fixes for initial render