Minor tweaks to get it running