Add some more calls to init()