More V2.2.0 changes and fixes