Fix status file bugs