Latest fixes for host deinit