Minor tweaks to get it working