Tweaks for source 1.5