Various fixes, check changelog for v2.2
Update changelog