Fixes for Jonabrams/synth#36