Small improvments to toxic-git pkg build