some more ferm fixups