retiming fixes