lockd: bugfixes