small changes for development. Faster startup.