Don't log and fix a few resource warnings
This will create a new commit in order to revert the existing changes.