More renderer changes