Applied 1.5.2 sources to most files