Install fixes. Fixes #29