On-prem fixes