Various command tweaks