[DONE] fixes from mergeaccounts branch