Applied fixes that allow tests to pass again.