Final tweaks for 2.2