Fix container refs