minor fixes in diff patches