bug fixes for fop2