A couple of changes for deployment support.