Fix rubbish find and replace errors