Fix some issues causing spurious layout, breaking prepareForReuse