re-enabled other parts of FMP support