Cleanup, fix some bug and prepare for 9.2.2