Fix flash messages