Small bug fixes on dragdrap (adding guards, preventDefault)