Minor fixes.
Tested with a different account.