Fixes for container settings