CHM Network fixes