Fix some client side transition logic