Made updates for 1.5.7 compatibility.