Quick fixes to transitioning