Tweaks

Tweaks to combat