Fix error messages
Merge branch '1.0' into 2.0