Slight changes for v0.3/v0.4 compatibility.