Fix several crashes
Merge branch 'master' of github.com:raphaelm/opacclient