Bug-fixes - should work with CMOS now.