drop container fixes