Small fixes #29