Fixes to commands