various fixes for commands