No delay on startup and other fixes.