batch of patches

Signed-off-by: owwlo <owwlo@163.com>