F/#3 fixups after review