Believe these were causing FC issues.

Change-Id: Ifa4659c8b47c0c3d5dcfa1d8753f100f8c441fef