Fixes for issue 896
3 files changed