Tweaks to run on a faster machine