Exports fixes + mongo adapter improvements