Minor changes to fix container issues.

Not final