Improve Firefox compatability (still not working).