Fixes for the 2.2 beta.