Updates for promise a+ compliance