Tweaks for pre-2.6 installs