Some fixes in paths