Interactive mode, some fix