Reflow removal. Minor fixes.