Fix paths
Updated config handling