More fixes for render