Fixes for tenanted hosting