FF workaround & fixes