FF and IE fixes for #2