Fixes for issue #75