Trvial changes

See commit lines for descriptions