Fixes to pass lint-checking