Changes needed for upload to HCP svn