Even more flash message handling