improve lock/suspend commands