speed fixes for ff