Code review fixes and add repositories