ch2 bug fixes

#485 and #487