Schema tweaks.