Updates from autopkg
cleanup