Fix debug blocks