Fixed more instances of username => get_username()