Tweaks to dependencies/imports