Review/bcc fixes