HCD: Various (minor) improvements to stability.