Cleanup some find/replace errors