More fixes for shared objects