[fix] [minor] fixes in old patches