Resolve FireFox bugs