Release 2.0.2, various fixes