Minor tweaks to ensure it builds