Updates to FCS 0.0.36