fixes for shared building