Patches from Frank Cusack: