More 4.1 fixes