[#3029] Lint fixes and some bugs I added from review fixes on top of each other.