Fix some failures.