Minor changes to update to 2.4.2 RM