Fixed some Lint issues