Fix things to work.