Some fixes for Ch 2