Some changes for building on new VM