General fixes. Api change.