Fixes for when only requirements.txt installed

(Fallout from HEAD^^, should be fixup-ed with it.)