V2.2

- Fix various error missed in the last release