More fixes to patches after upstrem commits