Fixes to UM6 driver