Tweaks to get things compiling