Minor changes, restores Barak compatibility.