Edx merge fixes