Other fixes #73