more flash message fixes