[Followup PR-495] Fixes backwards compatibility issues