Some nick(name) fixes