Fixes for FF.