More locking tweaks

Signed-off-by: Paul Brook <paul@nowt.org>
Remove more debug output

Signed-off-by: Paul Brook <paul@nowt.org>