Minor changes to implementation of Accounts