Fixing Foundation 4.2.0 bugs until they catch up.