Tweaks to get it working fully