Fix various start up issues