Fix some stuff with notes