Fixes for shared deployment configurations