Fixes for reinit race