Bug fixes and load speed improvements