Pull in misc fixes from trunk.