Tremolo between 2 notes bug fixes

Tentative fixes for solving two bugs in operations with tremolo between 2 notes.