Resolved several container registration issues pulled over from the multi-tenancy branch.