Fix Flash Messages