Fixed some issues for FF