Fixed notes mentioned by Klaim - Joël Lamotte during review