Fix status text and messages