make fixes for ff