GPDOM fixes