Modifications for getting deployment working