Resolving some issues with data repositories.