Tweaks to get things working with frontend