Apply changes to new document creation

We now use defer for all operations. There were a few then missing internally to make sure everything is in sync