Fix disable and status commands