significant fixes for FEMS