PC repo saving + configuration fixes