Fixes for 2 and 3 compatibility.