add patch fix-little-inconsistencies