Manual patch fixing is fun...