Various tweaks to HCP processing pipeline