Little optimizations for startup

This is an attempt to mitigate the glimpse issue of #1400 
An even better mitigation might be to stop using glimpse.