Fixes to make notes plugin functional again