Tweak internals for command forcing