Some initial lint fixes