More drop fixes