Fix some of the lint issues