Fix/public repo fixes