Fixes for paths

blah