Fixing memory requirements.