fixes for FF