Minor nitpickings