Fix commands with arguments