Fix some of the notes mentioned by Andrey Semashev (more to come)