Add fixes to support importing early 2013 documents