Bugfix/15

Two fixes as detailed in #15