Fix strategy issues.