Fixed lock checkbox issues