Fix promise handling w/ db attachments