Tweaks to loadwatch