Fix delay line issue
Added some patches