More LD fixes