General fixes for recently introduced failures.
This will create a new commit in order to revert the existing changes.