Pull in the latest upstream changes from matyb

Pull a couple of minor upstream changes from matyb's repository.