More Firefox fixing