Tweaks to compile correctly