Performance Improvements for Startup operations.

Don't merge yet.