Fixes from Bart Oldeman