Lots of little bugs from the transition fixed