Bug fixes for notes