Minor tweaks to lock table