Small fixes to v1.0