Foundation 5.2.1 adjustments