Various tweaks for vanilla