Fixed firstname/lastname issues