Update to v4.1.7 with fixes