Final RF fixes