[fixes] fixes in patch