Some fixes & merge sysex