Minor updates on v1