Minor bugfix fixes #3