Fix issues with fc2

Fix issues #2912 and #3171