Tweak SONAME handling