Fixes for container-fluid inside containers