Fix Global/Search/Replace errors in last commit, broke the build