Last fixes for 2.0.0 version.