Merged in two missing changes from f-visibility tree.