Finish updates for switch to hyde