Mostly lint-related changes
A few minor fixes (and renaming due* to end*)