[#874153] Review fixes and the might lint has been appeased