Minor tweaks to make it work