more RF fixes