Updates to core 2.2