Fix issue #1 and issue #2 per @somatonic