Fixes for repository changes.