Added a few untracked files missed last time, and minor fix for lint