Improve rendering performance
Minor fixes