System on demand restricting fixes

Refs #1859