Patches following commit 0e49bf8.