Fix some global search and replace gremlins