Fix some transitions for error/success messages