Fixes for on-prem- configurations