various Stock 4.1 fixes by @ketut.kumajaya