Fixes to breaking a few shared components