Updates to make distribution pass more author/release tests