clean up some warnings when code analyzed