Fix a few Note inconsistencies

46 jobs for master in 394 minutes and 12 seconds (queued for 12 seconds)