FM fix duplicates and a derp

Change-Id: I1523565cc009cf0e9a56568c64dc1a0ce962e5cc