Fixes for combining multiple accounts