Import latest fixes for Kontrol X1