Fix minor re-rendering problems