Fix errors with remote-doc-0009 and -0011