Tweaks for backwards compatibility