Fix backporting
Fixed minor CQC issues