Some minor corrections for driver code to build