Fix render problems