Notes bug fixes