Merge "Minor fixes in Account"