Merge pull request #73 from ferd/various-fixes

Various fixes