Two tickets

Fixes #109 and #108