fixes for FF
Merge