Fixed some minor issues caused by the account changes today