Address path issues post-integration testing