Fix issues with autogenerated paths