Fixes for paths