Fix: #5210eedb7ece34e11f000006, #52122f607ece34392e000000, #52122e8c039555ec2f000001 minor improvements around notes