Working through Firefox and Safari bugs.