Bug fixes, here comes 2.2.2