Fix some style, cb issues