Fixes for dropping and moving elements