Fixes a few bugs from the transition