Fix active display and lock targets