Fixes for shared configuration