Fix status and other commands