Fix container views and volume views