Fixed regressions introduced by latest FCS