Fix
more fixes.. appears to work fine now with all packages