Minor updates for v1.0 production