Fix bug because of which documents got all the basemodel methods on 'em after saving
Minor changes