Fixes for initial drop.