Backwards compatibility fixes

See commit comments.