Some significant changes to get DEPS working right