Fix 2 issues with nicknames