Fixing two bugs discovered in Largo