Make changes to support final version of master edition