Fix/public repo fixes

:+1: