Adaptions to be compliant to the Maniacbug driver

Unfortunately this does not work reliably on the MSP - I don't know why :(