Fixes for common RF