HH-29111 further bug fixing (incomplete)