Fixes towards 2.2.