Small optimization
Improved on demand locking, on demand timeout, fixed asking same question

Refs #1238