Tweaks to fix issues