Fixes from Roland Kaufmann
3 files changed