LMTP/LDA changes