First fixes for v2.0