Some render classes fixes