Adress a few forcheck warnings.