Bug fixes and optimization for first launch