Fixes to commands.