Several rendering improvements