RF-model: some fixes