add fixes to support ecto master 7728442642984ec8d353da36e50f68901a4dcbf1