Add madeup's patches