RF: minor changes