Tweak init a bit more