Fix a couple of issues and style inconsistencies pointed out by eslint

While those fixes are independent, the goal here is to run eslint as part of our CI to catch errors and style nits automatically.