Tweaks

Additional tweaks