Fix status updates