Fixing up some evil rerender issues