Minor default configuration and execution tweaks