Working on 2050 fixes