Mending Patches etc

Mending Patches etc