More fixes for init-drag