Several fixes after setting up correctly my repo