Reflow fixes