Some minor changes to make startup work a bit more seemlessly