Further fixes to goxc setup