F fixes

Final merge before phase 1 release