fixes, and prep for hardfork