Fixes for common RF 2