Last patch was already fixed upstream. First patch was sent. Signed-off-by: Rosen Penev <rosenp@gmail.com>