fixes && pkgng support+