Fixes/improvements from pypa/sampleproject