Some vain attempts to fix performance issues.