Storage and optimization tweaks.