Fixes from Robert Kaiser
4 files changed