tweaks to get new packages working