fixes for ff