Minor fixes; now sync and drop work correctly.