Cbecc fixes

@kbenne can you check these out and merge?
ah ha!  Well you did warn me!