Fix assorted command handlers