Some minor updates for 2.4.1