Small cleanup, package distribution