Fixed some latest things upon v2.0