Fix Surface units keys