Some fixes towards ISSUE #42