Tweaks and hacks to make things work in versions 0.90 through 1.1