Added fixes for FF