Various fixes for 2.0 API