Some drag bugs fixed