Backwards compatibility tweaks #90