fix === true, lint fixes