fix some path/bucket issues