half fixes to unblock dev on drag and drop on container page