Fixes and nickname support