4.2.3.h3

Put in two of four fixes.