Some fixes found during Firefox interop