minor updates in prep for cutover to 4.1