Updates to FCS 0.0.36 and fix for #367