Flash messages fixed up.

Needs testing, but should be all good.