Renderless fixes