Primarily setup.sh fix

@AndyMenzies, could you please take a quick look at this for me please?  Thanks