Several changes in support of gf getting more tests to pass.