Fixes submitted by Lieven de Cock: