Fix some flag options for the clean run mode
This will create a new commit in order to revert the existing changes.
