EB tweaks