Bug fixes for repos