Some fixes - issue #101