Bug fixes and init cleanup for Hub integration code.