Few command tweaks