Path fixes

A number of fixes for issue #61