Better edit and drag locks