Work around Firefox bug

https://bugzilla.mozilla.org/show_bug.cgi?id=625289
Changed 'force' option back to default
Minor changes