Fixes to allow note synchronization.  Some notes will still not
synchronize, but many have been fixed.