Updates to get command line build working