Updates for compatibility with latest FCS

Fixes #372