init: A few small changes