Small fixes - issue #81