lint validation, some lint fixes