lint error/warning fixes

OK then, I was just curious.