Fix Replace Errors