Fix some obvious lint issues