Add more of Oliver Pinter's patches