Fixes from Andreas.