last fixes for 2.0 release