Fixes for nested container elements in serialisation