Delay fixes