Apply corrections required for latest wishbone changes