Fix double-locking in channelmanager