Small improvements to init process