Tweaks to init() and reInit()