REF: minor changes