Minor command fixes, cleanup