Cbecc fixes

@kbenne can you check these out and merge?