These changes fix the lint errors coming from rustc during the build.
This will create a new commit in order to revert the existing changes.
