Bugfixes to make micronucleus reentrant