Tweaks to get working