fixes for different types of notes that get returned