Various RF improvements