More work on 2.4.2 migration