Fix even more rendering issues.