Assorted fixes and changes from originalrdlint  PR