Further address #1, Lockdown fixes and enhancements

Signed-off-by: Jimmie Lin <jimmie.lin@gmail.com>