Bug fixes for initial load state