Prepare dry run 1a

...only fixes, not a hardfork