diff --git a/src/ipa/raspberrypi/controller/rpi/awb.cpp b/src/ipa/raspberrypi/controller/rpi/awb.cpp
index ad75d55f0976..f5898fc48eb6 100644
--- a/src/ipa/raspberrypi/controller/rpi/awb.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/awb.cpp
@@ -406,7 +406,7 @@ double Awb::computeDelta2Sum(double gainR, double gainB)
                double deltaR = gainR * z.R - 1 - config_.whitepointR;
                double deltaB = gainB * z.B - 1 - config_.whitepointB;
                double delta2 = deltaR * deltaR + deltaB * deltaB;
-               /*LOG(RPiAwb, Debug) << "delta_r " << delta_r << " delta_b " << delta_b << " delta2 " << delta2; */
+               /* LOG(RPiAwb, Debug) << "delta_r " << delta_r << " delta_b " << delta_b << " delta2 " << delta2; */
                delta2 = std::min(delta2, config_.deltaLimit);
                delta2Sum += delta2;
        }
diff --git a/src/ipa/raspberrypi/controller/rpi/awb.h b/src/ipa/raspberrypi/controller/rpi/awb.h
index 9e075624c429..058f0d4cb091 100644
--- a/src/ipa/raspberrypi/controller/rpi/awb.h
+++ b/src/ipa/raspberrypi/controller/rpi/awb.h
@@ -41,10 +41,8 @@ struct AwbConfig {
        double speed; /* IIR filter speed applied to algorithm results */
        bool fast; /* "fast" mode uses a 16x16 rather than 32x32 grid */
        Pwl ctR; /* function maps CT to r (= R/G) */
-       Pwl ctB; /*
-       Pwl ctB;  * function maps CT to b (= B/G)
-        * table of illuminant priors at different lux levels
-        */
+       Pwl ctB; /* function maps CT to b (= B/G) */
+       /* table of illuminant priors at different lux levels */
        std::vector<AwbPrior> priors;
        /* AWB "modes" (determines the search range) */
        std::map<std::string, AwbMode> modes;
diff --git a/src/ipa/raspberrypi/controller/rpi/black_level.cpp b/src/ipa/raspberrypi/controller/rpi/black_level.cpp
index 0799d7b9195a..def19ccb42a2 100644
--- a/src/ipa/raspberrypi/controller/rpi/black_level.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/black_level.cpp
@@ -35,9 +35,9 @@ void BlackLevel::read(boost::property_tree::ptree const &params)
 {
        uint16_t blackLevel = params.get<uint16_t>(
                "black_level", 4096); /* 64 in 10 bits scaled to 16 bits */
-       blackLevelR_ = params.get<uint16_t>("blackLevelR", blackLevel);
-       blackLevelG_ = params.get<uint16_t>("blackLevelG", blackLevel);
-       blackLevelB_ = params.get<uint16_t>("blackLevelB", blackLevel);
+       blackLevelR_ = params.get<uint16_t>("black_level_r", blackLevel);
+       blackLevelG_ = params.get<uint16_t>("black_level_g", blackLevel);
+       blackLevelB_ = params.get<uint16_t>("black_level_b", blackLevel);
        LOG(RPiBlackLevel, Debug)
                << " Read black levels red " << blackLevelR_
                << " green " << blackLevelG_