Bug fixes of ST and LD.