Gail Badner, it looks like both of them can be fixed with the same change; by making sure that the foreign-key name is being properly set prior to the OneToOneSecondPass manually calling ToOneFkSecondPass#doSecondPass. i'll push a PR shortly if you want to give it a look.