Fixes from Stefan.