Fixes for paths.