Update to 2.2.1.1-1, fix 4.3 issues