Minor improvements for patches and confs.