Private repo fixes