Additional fixes for 0.7 and 0.8 compatibility.