HMM minor changes