Add 4.2 JB workaround to these classes as well