Add the minor improvements to oneinit (whoops)