Few patch-validating fixes