Some fixes towards Issue #10