small fop changes