Upgrade fixes:
1) Startup
2) Concurrent map checks