Updates for v1.2-alpha