Various fixes for 1.0 branch