Fixes to driver commands