Small changes to enable driver to work with XC NCIP toolkit