Slightly more fixes to patches