Proper shims for Firefox