fix some of the issues from lint