[PATCH 0/2] Small CBCH fixes, and playground