from steven mestdagh <steven.mestdagh@esat.kuleuven.ac.be> fixes from alek@; regen the patches while I am here ok alek@ espie@
robert