Fixing flash messaging issues