Small fixes - issue #1