Integrate some more diffs from the 1.5 branch