updated fixes for container