Applied some patches onto V1.4.1