Fixes for more compatibility.