Fixing issues that were causing failures.