DDR retention fixes