misc changes + shlibs