Fix kibit and eastwood warnings