Some tweaks for FF.