Apply suggested fixes

2 jobs for !115 with notes-fix in 2 minutes and 55 seconds (queued for 1 minute and 47 seconds)
latest merge request