minor fixes for CBreaker