Tweaks to performance