Fix more rendering issues