minor fixes from Ghent University