Fixed some carelessness in search-and-replace