0011666: Some fixes for Expressodriver