Miscellaneous HCP fixes