Fixes for custom render logic