Small tweaks with keys and locks.