Add fixes required for on-prem version