Fix status handling and completion