Small fixes in 2.2.0-rc1 post (bg)