Fixing render issues