Fixes for multi-version compatibility.