package/repo fixes