Fix container linking (closes #5)