Fixes to the shared build