Two patches from Marcus.
3 files changed