Changes required to support Firefox