Quick deadlock fixes. May be unstable.
fix lint issue
Merge branch 'gatoatigrado-nonblocking-get'