Target Spec updates, Drag and drop fixes