Fixed repository-specific code prior to merge with csdl/makahiki.