Apply Olli's changes also to the reference containers