lint error/warning fixes