some fixes for ff