Tweaks to setup
Include system log files in captured output