Bug fixes for FF