Make sure all containers (even previously stopped) get a correct wait lock