Minor changes for v1.1